Merged from trunk
authorJason Rumney <jasonr@gnu.org>
Sun, 10 Jan 2010 14:18:39 +0000 (22:18 +0800)
committerJason Rumney <jasonr@gnu.org>
Sun, 10 Jan 2010 14:18:39 +0000 (22:18 +0800)

Trivial merge